From: Bernd Zeimetz <bernd@bzed.de>
Date: Tue, 22 Jun 2010 21:53:33 +0000 (+0200)
Subject: Merge branch 'upstream'
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~176
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=37a299e39cf44ba6aa5d3f5e2b69bdda52e30335;p=gpsbabel.git

Merge branch 'upstream'
---

37a299e39cf44ba6aa5d3f5e2b69bdda52e30335